Skip to contentSkip to conversation

Change in openvpn[master]: Collect trivial conversion fixes

Openvpn-devel In review flichtenheld (Code Review) 2 participants 6 messages Aug 7, 2025 – Aug 17, 2025 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): gerrit.1754586150000.Id565ec17856444b580dd89edab92e9fe18d39b77@...2715...

#1 lore raw

Attention is currently required from: plaisthos.

Hello plaisthos,

I'd like you to do a code review.
Please visit

    http://gerrit.openvpn.net/c/openvpn/+/1140?usp=email

to review the following change.

Change subject: Collect trivial conversion fixes
......................................................................

Collect trivial conversion fixes

These are very local, simple fixes that do not
warrant their own commit.

Change-Id Id565ec17856444b580dd89edab92e9fe18d39b77

---
M src/openvpn/crypto.c
M src/openvpn/init.c
M src/openvpn/options.c
M src/openvpn/pool.c

4 files changed, 4 insertions(+), 4 deletions(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/40/1140/1

src/openvpn/crypto.c +1 -1
index e128bb8..f7a0206 100644
@@ -1901,7 +1901,7 @@
     const char *seed = "tls1-prf-test";
     const char *secret = "tls1-prf-test-secret";
     uint8_t out[8];
-    uint8_t expected_out[] = { 'q', 'D', '\xfe', '%', '@', 's', 'u', '\x95' };
+    uint8_t expected_out[] = { 'q', 'D', 0xfe, '%', '@', 's', 'u', 0x95 };
 
     int ret = ssl_tls1_PRF((uint8_t *)seed, strlen(seed), (uint8_t *)secret,
                            strlen(secret), out, sizeof(out));
src/openvpn/init.c +1 -1
index 2d6dacd..3cbdcf8 100644
@@ -343,7 +343,7 @@
         const char *status = (ce->flags & CE_DISABLED) ? "disabled" : "enabled";
 
         /* space for output including 3 commas and a nul */
-        int len =
+        size_t len =
             strlen(ce->remote) + strlen(ce->remote_port) + strlen(proto) + strlen(status) + 3 + 1;
         char *out = malloc(len);
         check_malloc_return(out);
src/openvpn/options.c +1 -1
index 2fffa65..670718f 100644
@@ -4960,7 +4960,7 @@
 #endif
 
 static inline bool
-space(unsigned char c)
+space(char c)
 {
     return c == '\0' || isspace(c);
 }
src/openvpn/pool.c +1 -1
index abbad8f..cd1c768 100644
@@ -158,7 +158,7 @@
         switch (pool->ipv4.type)
         {
             case IFCONFIG_POOL_30NET:
-                pool->ipv4.base = start & ~3;
+                pool->ipv4.base = start & ~3u;
                 pool_ipv4_size = (((end | 3) + 1) - pool->ipv4.base) >> 2;
                 break;
 

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1140?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Id565ec17856444b580dd89edab92e9fe18d39b77
Gerrit-Change-Number: 1140
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-MessageType: newchange

#2 lore raw
In reply to a message not in the archive

Attention is currently required from: flichtenheld, plaisthos.

cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/1140?usp=email )

Change subject: Collect trivial conversion fixes
......................................................................

Patch Set 1: Code-Review+2

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1140?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Id565ec17856444b580dd89edab92e9fe18d39b77
Gerrit-Change-Number: 1140
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Thu, 07 Aug 2025 20:39:52 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

#3 lore raw

PATCH v3 1/1 Collect trivial conversion fixes

In reply to a message not in the archive

From: Frank Lichtenheld <[email protected]...>

These are very local, simple fixes that do not
warrant their own commit.

Change-Id Id565ec17856444b580dd89edab92e9fe18d39b77

---

This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.

Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1140
This mail reflects revision 3 of this Change.

Acked-by according to Gerrit (reflected above):
Gert Doering <[email protected]...>

src/openvpn/crypto.c +1 -1
index af7583a..a63e543 100644
@@ -1901,7 +1901,7 @@
     const char *seed = "tls1-prf-test";
     const char *secret = "tls1-prf-test-secret";
     uint8_t out[8];
-    uint8_t expected_out[] = { 'q', 'D', '\xfe', '%', '@', 's', 'u', '\x95' };
+    uint8_t expected_out[] = { 'q', 'D', 0xfe, '%', '@', 's', 'u', 0x95 };
 
     int ret = ssl_tls1_PRF((uint8_t *)seed, (int)strlen(seed), (uint8_t *)secret,
                            (int)strlen(secret), out, sizeof(out));
src/openvpn/init.c +1 -1
index 40ae2c8..5583274 100644
@@ -343,7 +343,7 @@
         const char *status = (ce->flags & CE_DISABLED) ? "disabled" : "enabled";
 
         /* space for output including 3 commas and a nul */
-        int len =
+        size_t len =
             strlen(ce->remote) + strlen(ce->remote_port) + strlen(proto) + strlen(status) + 3 + 1;
         char *out = malloc(len);
         check_malloc_return(out);
src/openvpn/options.c +1 -1
index d4dc0d3..d1c41d4 100644
@@ -4957,7 +4957,7 @@
 #endif
 
 static inline bool
-space(unsigned char c)
+space(char c)
 {
     return c == '\0' || isspace(c);
 }
src/openvpn/pool.c +1 -1
index 898a045..a41364a 100644
@@ -158,7 +158,7 @@
         switch (pool->ipv4.type)
         {
             case IFCONFIG_POOL_30NET:
-                pool->ipv4.base = start & ~3;
+                pool->ipv4.base = start & ~3u;
                 pool_ipv4_size = (((end | 3) + 1) - pool->ipv4.base) >> 2;
                 break;
 
#4 lore raw

[Openvpn-devel] [PATCH applied] Re: Collect trivial conversion fixes

The first three are really outright trivial. The fourth I felt a bit unsure about, so tested various combinations of --ifconfig-pool <start> and it's indeed correct.

Your patch has been applied to the master branch.

commit acc8f82fca61ea5478ab0bd16c16fff5c07ec9af

Author: Frank Lichtenheld
Date:   Sun Aug 17 16:39:15 2025 +0200
     Collect trivial conversion fixes

     Signed-off-by: Frank Lichtenheld <[email protected]...>
     Acked-by: Gert Doering <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg32611.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering

#5 lore raw
In reply to a message not in the archive

cron2 has uploaded a new patch set (#4) to the change originally created by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/1140?usp=email )

The following approvals got outdated and were removed:
Code-Review+2 by cron2

Change subject: Collect trivial conversion fixes
......................................................................

Collect trivial conversion fixes

These are very local, simple fixes that do not
warrant their own commit.

Change-Id Id565ec17856444b580dd89edab92e9fe18d39b77

Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg32611.html

---
M src/openvpn/crypto.c
M src/openvpn/init.c
M src/openvpn/options.c
M src/openvpn/pool.c

4 files changed, 4 insertions(+), 4 deletions(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/40/1140/4

src/openvpn/crypto.c +1 -1
index af7583a..a63e543 100644
@@ -1901,7 +1901,7 @@
     const char *seed = "tls1-prf-test";
     const char *secret = "tls1-prf-test-secret";
     uint8_t out[8];
-    uint8_t expected_out[] = { 'q', 'D', '\xfe', '%', '@', 's', 'u', '\x95' };
+    uint8_t expected_out[] = { 'q', 'D', 0xfe, '%', '@', 's', 'u', 0x95 };
 
     int ret = ssl_tls1_PRF((uint8_t *)seed, (int)strlen(seed), (uint8_t *)secret,
                            (int)strlen(secret), out, sizeof(out));
src/openvpn/init.c +1 -1
index 40ae2c8..5583274 100644
@@ -343,7 +343,7 @@
         const char *status = (ce->flags & CE_DISABLED) ? "disabled" : "enabled";
 
         /* space for output including 3 commas and a nul */
-        int len =
+        size_t len =
             strlen(ce->remote) + strlen(ce->remote_port) + strlen(proto) + strlen(status) + 3 + 1;
         char *out = malloc(len);
         check_malloc_return(out);
src/openvpn/options.c +1 -1
index c54032d..5f9971c 100644
@@ -4957,7 +4957,7 @@
 #endif
 
 static inline bool
-space(unsigned char c)
+space(char c)
 {
     return c == '\0' || isspace(c);
 }
src/openvpn/pool.c +1 -1
index 898a045..a41364a 100644
@@ -158,7 +158,7 @@
         switch (pool->ipv4.type)
         {
             case IFCONFIG_POOL_30NET:
-                pool->ipv4.base = start & ~3;
+                pool->ipv4.base = start & ~3u;
                 pool_ipv4_size = (((end | 3) + 1) - pool->ipv4.base) >> 2;
                 break;
 

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1140?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Id565ec17856444b580dd89edab92e9fe18d39b77
Gerrit-Change-Number: 1140
Gerrit-PatchSet: 4
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: newpatchset

#6 lore raw
In reply to a message not in the archive

cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/1140?usp=email )

Change subject: Collect trivial conversion fixes
......................................................................

Collect trivial conversion fixes

These are very local, simple fixes that do not
warrant their own commit.

Change-Id Id565ec17856444b580dd89edab92e9fe18d39b77

Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg32611.html

---
M src/openvpn/crypto.c
M src/openvpn/init.c
M src/openvpn/options.c
M src/openvpn/pool.c

4 files changed, 4 insertions(+), 4 deletions(-)
src/openvpn/crypto.c +1 -1
index af7583a..a63e543 100644
@@ -1901,7 +1901,7 @@
     const char *seed = "tls1-prf-test";
     const char *secret = "tls1-prf-test-secret";
     uint8_t out[8];
-    uint8_t expected_out[] = { 'q', 'D', '\xfe', '%', '@', 's', 'u', '\x95' };
+    uint8_t expected_out[] = { 'q', 'D', 0xfe, '%', '@', 's', 'u', 0x95 };
 
     int ret = ssl_tls1_PRF((uint8_t *)seed, (int)strlen(seed), (uint8_t *)secret,
                            (int)strlen(secret), out, sizeof(out));
src/openvpn/init.c +1 -1
index 40ae2c8..5583274 100644
@@ -343,7 +343,7 @@
         const char *status = (ce->flags & CE_DISABLED) ? "disabled" : "enabled";
 
         /* space for output including 3 commas and a nul */
-        int len =
+        size_t len =
             strlen(ce->remote) + strlen(ce->remote_port) + strlen(proto) + strlen(status) + 3 + 1;
         char *out = malloc(len);
         check_malloc_return(out);
src/openvpn/options.c +1 -1
index c54032d..5f9971c 100644
@@ -4957,7 +4957,7 @@
 #endif
 
 static inline bool
-space(unsigned char c)
+space(char c)
 {
     return c == '\0' || isspace(c);
 }
src/openvpn/pool.c +1 -1
index 898a045..a41364a 100644
@@ -158,7 +158,7 @@
         switch (pool->ipv4.type)
         {
             case IFCONFIG_POOL_30NET:
-                pool->ipv4.base = start & ~3;
+                pool->ipv4.base = start & ~3u;
                 pool_ipv4_size = (((end | 3) + 1) - pool->ipv4.base) >> 2;
                 break;
 

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1140?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Id565ec17856444b580dd89edab92e9fe18d39b77
Gerrit-Change-Number: 1140
Gerrit-PatchSet: 4
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: merged